let's take the MIN of width and max_width here, not width and max_width !=

2005-07-13  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeview.c (gtk_tree_view_new_column_width): let's take
	the MIN of width and max_width here, not width and max_width != -1.
	(fixes #144480, reported by Mikael Magnusson).

diff --git a/ChangeLog b/ChangeLog
index d99da1cc4ebce48dd262c555d6dd6439166089b3..6e9be2485985b9a023710a3112b637e26d52d1f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-13  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_new_column_width): let's take
+       the MIN of width and max_width here, not width and max_width != -1.
+       (fixes #144480, reported by Mikael Magnusson).
+
 2005-07-13  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (load_themes): Don't keep the caches

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d99da1cc4ebce48dd262c555d6dd6439166089b3..6e9be2485985b9a023710a3112b637e26d52d1f0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-07-13  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_new_column_width): let's take
+       the MIN of width and max_width here, not width and max_width != -1.
+       (fixes #144480, reported by Mikael Magnusson).
+
 2005-07-13  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (load_themes): Don't keep the caches

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d99da1cc4ebce48dd262c555d6dd6439166089b3..6e9be2485985b9a023710a3112b637e26d52d1f0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-07-13  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_new_column_width): let's take
+       the MIN of width and max_width here, not width and max_width != -1.
+       (fixes #144480, reported by Mikael Magnusson).
+
 2005-07-13  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (load_themes): Don't keep the caches

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index d1978ecb40ecf79d6d8ed5ea6b0de91c06980b22..164e900727fb601b9e5f3f1446e321337bc5fe37 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -9229,7 +9229,7 @@ gtk_tree_view_new_column_width (GtkTreeView *tree_view,
     width = MAX (column->min_width,
                 width);
   if (column->max_width != -1)
-    width = MIN (width, column->max_width != -1);
+    width = MIN (width, column->max_width);
 
   *x = rtl ? (column->button->allocation.x + column->button->allocation.width - width) : (column->button->allocation.x + width);